package com.edu.admin.api;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

@SpringBootApplication
/*@RestController*/
public class EduAdminApiApplication {

/**

 *测试：80 端口、环境搭建
 *      git版本冲突控制
 *      线上线下修改合并变基


    @GetMapping
    public String test(){
        return "success";//线下修改
    }


    @GetMapping
    public void test(){
        System.out.println("网页修改测试");//线下修改2
        System.out.println("网页修改测试");//线上修改2
    }
 */
    public void test(){
        System.out.println("dev分支，测试合并");
    }
    public void test1(){
        System.out.println("bug分支，测试合并");
    }
    public static void main(String[] args) {
        SpringApplication.run(EduAdminApiApplication.class, args);
    }




}
